From 8e5aeba1e4ec64580938a9c2a07b0f827826855b Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Fri, 7 Jan 2005 17:58:21 +0000 Subject: [PATCH] bitkeeper revision 1.1159.212.11 (41decdbd8TPAvL-MaZNJDOO3L7L6MQ) Fix CONFIG_MAGIC_SYSRQ compile issue with Linux 2.4 kernel. --- linux-2.6.10-xen-sparse/arch/xen/kernel/reboot.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/linux-2.6.10-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6.10-xen-sparse/arch/xen/kernel/reboot.c index 78c46675f5..07aae9d0c6 100644 --- a/linux-2.6.10-xen-sparse/arch/xen/kernel/reboot.c +++ b/linux-2.6.10-xen-sparse/arch/xen/kernel/reboot.c @@ -217,7 +217,11 @@ static void __shutdown_handler(void *unused) static void __sysrq_handler(void *unused) { #ifdef CONFIG_MAGIC_SYSRQ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) handle_sysrq(pending_sysrq, NULL, NULL); +#else + handle_sysrq(pending_sysrq, NULL, NULL, NULL); +#endif #endif pending_sysrq = -1; } -- 2.30.2